Make GTK+ version the default, and add an emacsVER-lucid package.

diff --git a/debian/.gitignore b/debian/.gitignore
index 7027f2959cba1933386ed83f6f0b7d41d9560a0a..5653b488ab0a4233e6c1ae3c51f45c7be1fc0dea 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,6 +1,6 @@
 *~
 .\#*
-/build-gtk
+/build-lucid
 /build-nox
 /build-x
 /emacs
@@ -28,17 +28,17 @@
 /emacs23-el.debhelper.log
 /emacs23-el.prerm
 /emacs23-el.substvars
-/emacs23-gtk
-/emacs23-gtk.README.Debian
-/emacs23-gtk.debhelper.log
-/emacs23-gtk.desktop
-/emacs23-gtk.lintian-overrides
-/emacs23-gtk.menu
-/emacs23-gtk.postinst
-/emacs23-gtk.postinst.debhelper
-/emacs23-gtk.postrm.debhelper
-/emacs23-gtk.prerm
-/emacs23-gtk.substvars
+/emacs23-lucid
+/emacs23-lucid.README.Debian
+/emacs23-lucid.debhelper.log
+/emacs23-lucid.desktop
+/emacs23-lucid.lintian-overrides
+/emacs23-lucid.menu
+/emacs23-lucid.postinst
+/emacs23-lucid.postinst.debhelper
+/emacs23-lucid.postrm.debhelper
+/emacs23-lucid.prerm
+/emacs23-lucid.substvars
 /emacs23-nox
 /emacs23-nox.README.Debian
 /emacs23-nox.debhelper.log

diff --git a/debian/changelog b/debian/changelog
index 9a4b8cdb684aa33fb90838187bfcbd40ec393e37..11528c1959b9e8e75eb6567612dd94eb9bc6659a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,11 @@ emacs23 (23.1+1-3) unstable; urgency=low
   * Fix overlooked manpage rename in emacsVER.postinst.  Thanks to
     Sven Joachim <svenjoac@gmx.de>. (closes: #539926)
 
- -- Rob Browning <rlb@defaultvalue.org>  Sun, 30 Aug 2009 21:10:09 -0700
+  * Change emacsVER to be the GTK+ version to match the upstream
+    default, and add an emacsVER-lucid package for those who still
+    want the non-GTK+ version. (closes: #539800)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 30 Aug 2009 21:32:07 -0700
 
 emacs23 (23.1+1-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index e1cb068b8da6f5628cc674eebf477e8e756aeace..a76e1e110adacd8b216ebe7ba4fa4e01ec46ccbf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,22 +10,22 @@ Package: emacs
 Section: editors
 Priority: optional
 Architecture: all
-Depends: emacs23 | emacs23-gtk | emacs23-nox
+Depends: emacs23 | emacs23-lucid | emacs23-nox
 Provides: emacsen, editor, mail-reader, news-reader
 Description: The GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
  This is a metapackage which will always depend on the latest Emacs
  release.
 
-Package: emacs23
+Package: emacs23-lucid
 Section: editors
 Priority: optional
 Architecture: any
 Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
-Conflicts: emacs23-nox, emacs23-gtk
-Replaces: emacs23-nox, emacs23-gtk
+Conflicts: emacs23, emacs23-nox, emacs23-gtk
+Replaces: emacs23, emacs23-nox, emacs23-gtk
 Description: The GNU Emacs editor
  GNU Emacs is the extensible self-documenting text editor.
 
@@ -36,21 +36,21 @@ Architecture: any
 Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
-Conflicts: emacs23, emacs23-gtk
-Replaces: emacs23, emacs23-gtk
+Conflicts: emacs23, emacs23-lucid, emacs23-gtk
+Replaces: emacs23, emacs23-lucid, emacs23-gtk
 Description: The GNU Emacs editor (without X support)
  GNU Emacs is the extensible self-documenting text editor.
  This package contains a version of Emacs compiled without support for X.
 
-Package: emacs23-gtk
+Package: emacs23
 Section: editors
 Priority: optional
 Architecture: any
 Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
-Conflicts: emacs23, emacs23-nox
-Replaces: emacs23, emacs23-nox
+Conflicts: emacs23-lucid, emacs23-nox, emacs23-gtk
+Replaces: emacs23-lucid, emacs23-nox, emacs23-gtk
 Description: The GNU Emacs editor (with GTK+ user interface)
  GNU Emacs is the extensible self-documenting text editor.
  This package contains a version of Emacs with a GTK+ user interface.
@@ -63,7 +63,7 @@ Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}
 Description: The GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
- that's shared by emacs23, emacs23-gtk, and emacs23-nox.
+ that's shared by emacs23, emacs23-lucid, and emacs23-nox.
 
 Package: emacs23-common
 Section: editors
@@ -75,7 +75,7 @@ Conflicts: emacs23-el (<< ${Source-Version})
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure
- that's shared by emacs23, emacs23-gtk, and emacs23-nox.
+ that's shared by emacs23, emacs23-lucid, and emacs23-nox.
 
 Package: emacs23-el
 Section: editors

diff --git a/debian/control.in b/debian/control.in
index 97a676525bc2d8120647c0c79634958cd602ec10..8f1d48c8c97cb4e1c818b946d0811110478c5d41 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,22 +10,22 @@ Package: emacs
 Section: editors
 Priority: optional
 Architecture: all
-Depends: @DEB_FLAVOR@ | @DEB_FLAVOR@-gtk | @DEB_FLAVOR@-nox
+Depends: @DEB_FLAVOR@ | @DEB_FLAVOR@-lucid | @DEB_FLAVOR@-nox
 Provides: emacsen, editor, mail-reader, news-reader
 Description: The GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
  This is a metapackage which will always depend on the latest Emacs
  release.
 
-Package: @DEB_FLAVOR@
+Package: @DEB_FLAVOR@-lucid
 Section: editors
 Priority: optional
 Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk
-Replaces: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk
+Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk
+Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk
 Description: The GNU Emacs editor
  GNU Emacs is the extensible self-documenting text editor.
 
@@ -36,21 +36,21 @@ Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk
-Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk
+Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk
+Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk
 Description: The GNU Emacs editor (without X support)
  GNU Emacs is the extensible self-documenting text editor.
  This package contains a version of Emacs compiled without support for X.
 
-Package: @DEB_FLAVOR@-gtk
+Package: @DEB_FLAVOR@
 Section: editors
 Priority: optional
 Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
-Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
+Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk
+Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk
 Description: The GNU Emacs editor (with GTK+ user interface)
  GNU Emacs is the extensible self-documenting text editor.
  This package contains a version of Emacs with a GTK+ user interface.
@@ -63,7 +63,7 @@ Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}
 Description: The GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
- that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-gtk, and @DEB_FLAVOR@-nox.
+ that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
 
 Package: @DEB_FLAVOR@-common
 Section: editors
@@ -75,7 +75,7 @@ Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version})
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure
- that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-gtk, and @DEB_FLAVOR@-nox.
+ that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
 
 Package: @DEB_FLAVOR@-el
 Section: editors

diff --git a/debian/rules b/debian/rules
index 81fe5e2958a0a99589678f6595148c79fce383a3..d19618f3f9a37ecf7222c101075b031f950080ed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -222,12 +222,12 @@ nonpersistent_autogen_install_files := \
   debian/$(flavor)-nox.menu \
   debian/$(flavor)-nox.postinst \
   debian/$(flavor)-nox.prerm \
-  debian/$(flavor)-gtk.README.Debian \
-  debian/$(flavor)-gtk.desktop \
-  debian/$(flavor)-gtk.lintian-overrides \
-  debian/$(flavor)-gtk.menu \
-  debian/$(flavor)-gtk.postinst \
-  debian/$(flavor)-gtk.prerm \
+  debian/$(flavor)-lucid.README.Debian \
+  debian/$(flavor)-lucid.desktop \
+  debian/$(flavor)-lucid.lintian-overrides \
+  debian/$(flavor)-lucid.menu \
+  debian/$(flavor)-lucid.postinst \
+  debian/$(flavor)-lucid.prerm \
   debian/$(flavor).README.Debian \
   debian/$(flavor).desktop \
   debian/$(flavor).menu \
@@ -253,12 +253,12 @@ pkgdir_common := $(CURDIR)/debian/$(flavor)-common
 pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common
 pkgdir_x := $(CURDIR)/debian/$(flavor)
 pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox
-pkgdir_gtk := $(CURDIR)/debian/$(flavor)-gtk
+pkgdir_lucid := $(CURDIR)/debian/$(flavor)-lucid
 pkgdir_el := $(CURDIR)/debian/$(flavor)-el
 
 install_dir_x := $(CURDIR)/debian/install-x
 install_dir_nox := $(CURDIR)/debian/install-nox
-install_dir_gtk := $(CURDIR)/debian/install-gtk
+install_dir_lucid := $(CURDIR)/debian/install-lucid
 
 local_lpath := /etc/$(flavor):/etc/emacs
 local_lpath := $(local_lpath):/usr/local/share/emacs/$(runtime_ver)/site-lisp
@@ -351,8 +351,8 @@ define cleanup_all
     debian/install-x \
     debian/build-nox \
     debian/install-nox \
-    debian/build-gtk \
-    debian/install-gtk \
+    debian/build-lucid \
+    debian/install-lucid \
     debian/files*
   rm -rf debian/*.tmp
   rm -rf $(deb_trash)
@@ -517,8 +517,8 @@ debian/$(flavor).%: pkg_name := $(flavor)
 debian/$(flavor)-nox.%: xsupport := "nox"
 debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox
 
-debian/$(flavor)-gtk.%: xsupport := "gtk"
-debian/$(flavor)-gtk.%: pkg_name := $(flavor)-gtk
+debian/$(flavor)-lucid.%: xsupport := "lucid"
+debian/$(flavor)-lucid.%: pkg_name := $(flavor)-lucid
 
 debian/$(flavor)-common.%: pkg_name := $(flavor)-common
 debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common
@@ -541,7 +541,7 @@ debian/$(flavor).%: debian/emacsVER.% debian/changelog
 debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog
        $(call deb_sub,$<,$@)
 
-debian/$(flavor)-gtk.%: debian/emacsVER.% debian/changelog
+debian/$(flavor)-lucid.%: debian/emacsVER.% debian/changelog
        $(call deb_sub,$<,$@)
 
 debian/$(flavor)-common.README.Debian: \
@@ -589,18 +589,18 @@ confflags += --enable-locallisppath=$(local_lpath)
 # x configure flags
 confflags_x := $(confflags) 
 confflags_x += --with-x=yes
-confflags_x += --with-x-toolkit=athena
+confflags_x += --with-x-toolkit=gtk
 confflags_x += --with-toolkit-scroll-bars
 
 # nox configure flags
 confflags_nox := $(confflags) 
 confflags_nox += --with-x=no
 
-# gtk configure flags
-confflags_gtk := $(confflags) 
-confflags_gtk += --with-x=yes
-confflags_gtk += --with-x-toolkit=gtk
-confflags_gtk += --with-toolkit-scroll-bars
+# lucid configure flags
+confflags_lucid := $(confflags)
+confflags_lucid += --with-x=yes
+confflags_lucid += --with-x-toolkit=lucid
+confflags_lucid += --with-toolkit-scroll-bars
 
 configure: debian/stamp/configure
 .PHONY: configure
@@ -620,7 +620,7 @@ debian/stamp/configure: debian/stamp/setup
        $(checkdir)
        $(call cfg_tree,debian/build-x,$(confflags_x))
        $(call cfg_tree,debian/build-nox,$(confflags_nox))
-       $(call cfg_tree,debian/build-gtk,$(confflags_gtk))
+       $(call cfg_tree,debian/build-lucid,$(confflags_lucid))
        mkdir -p debian/stamp && touch $@
 
 build: debian/stamp/build
@@ -633,7 +633,7 @@ debian/stamp/build: debian/stamp/configure $(autogen_build_files)
         #cd debian/build-x && $(build_cmd) clean
        $(call build_cmd,debian/build-x)
        $(call build_cmd,debian/build-nox)
-       $(call build_cmd,debian/build-gtk)
+       $(call build_cmd,debian/build-lucid)
        mkdir -p debian/stamp && touch $@
 
 
@@ -667,7 +667,7 @@ install: debian/stamp/build $(autogen_install_files)
        dh_clean -k
        dh_installdirs
 
-       rm -rf $(install_dir_x) $(install_dir_nox) $(install_dir_gtk)
+       rm -rf $(install_dir_x) $(install_dir_nox) $(install_dir_lucid)
 
         # Deal with accidental multiple version problem.
        rm -f debian/build-x/etc/DOC-$(runtime_ver).*
@@ -681,7 +681,7 @@ install: debian/stamp/build $(autogen_install_files)
        rm -f debian/build-nox/src/emacs
        $(call emacs_inst,build-nox,$(install_dir_nox))
 
-       $(call emacs_inst,build-gtk,$(install_dir_gtk))
+       $(call emacs_inst,build-lucid,$(install_dir_lucid))
 
 #        # Use X install dir for the common packages too.
 #      $(call emacs_inst,build-x,$(install_dir_x))
@@ -824,16 +824,16 @@ install: debian/stamp/build $(autogen_install_files)
        rm -rf $(install_dir_nox)
 
         ##################################################
-        # emacsXY-gtk
-       $(call emacs_inst,build-gtk,$(install_dir_gtk))
+        # emacsXY-lucid
+       $(call emacs_inst,build-lucid,$(install_dir_lucid))
        $(call install_common_binpkg_bits,\
-         $(install_dir_gtk),$(pkgdir_gtk),$(flavor)-gtk,gtk)
+         $(install_dir_lucid),$(pkgdir_lucid),$(flavor)-lucid,lucid)
 
         # install desktop entry
-       install -d $(pkgdir_gtk)/usr/share/applications
+       install -d $(pkgdir_lucid)/usr/share/applications
        install -m 0644 \
-         debian/$(flavor)-gtk.desktop $(pkgdir_gtk)/usr/share/applications/
-       rm -rf $(install_dir_gtk)
+         debian/$(flavor)-lucid.desktop $(pkgdir_lucid)/usr/share/applications/
+       rm -rf $(install_dir_lucid)
 
         ##################################################
         # emacsXY-el
@@ -847,7 +847,7 @@ install: debian/stamp/build $(autogen_install_files)
         # final cleanup
        rm -rf $(install_dir_x)
        rm -rf $(install_dir_nox)
-       rm -rf $(install_dir_gtk)
+       rm -rf $(install_dir_lucid)
 
 
 binary-indep: build install